From: John Ralls <jralls@ceridwen.us>
Date: Sun, 10 Oct 2021 20:16:49 +0000 (-0700)
Subject: [gtkimcontextquartz] Accommodate moving GdkSurface widget to private.
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~91^2^2~247
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cfadca696bee8f576834a8ccf6b927dd9c2b4030;p=gtk4.git

[gtkimcontextquartz] Accommodate moving GdkSurface widget to private.

Fixes macOS build.
---

diff --git a/gtk/gtkimcontextquartz.c b/gtk/gtkimcontextquartz.c
index fc1e1ff3a8..a64b9a22e0 100644
--- a/gtk/gtkimcontextquartz.c
+++ b/gtk/gtkimcontextquartz.c
@@ -28,6 +28,7 @@
 #include "gdk/macos/gdkmacos.h"
 #include "gdk/macos/gdkmacosdisplay-private.h"
 #include "gdk/macos/gdkmacossurface-private.h"
+#include "gdk/gdksurfaceprivate.h"
 
 #import "gdk/macos/GdkMacosBaseView.h"
 
@@ -304,6 +305,7 @@ static void
 quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
 {
   GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context);
+  GtkWidget* surface_widget = GTK_WIDGET (gdk_surface_get_widget (qc->client_surface));
   int sx, sy;
   double wx, wy;
 
@@ -316,8 +318,9 @@ quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
     return;
 
   gdk_surface_get_origin (qc->client_surface, &sx, &sy);
-  gtk_widget_translate_coordinates(qc->client_widget, qc->client_surface->widget, area->x, area->y, &wx, &wy);
-  
+  gtk_widget_translate_coordinates(qc->client_widget, surface_widget,
+                                   area->x, area->y, &wx, &wy);
+
   qc->cursor_rect->x = sx + (int) wx;
   qc->cursor_rect->y = sy + (int) wy;
   qc->cursor_rect->width = area->width;